inspector: Avoid a critical warning
authorMatthias Clasen <mclasen@redhat.com>
Wed, 22 May 2019 00:43:04 +0000 (00:43 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 28 May 2019 20:25:16 +0000 (20:25 +0000)
gtk/inspector/visual.c

index 000c7673a092d8a5a62f9a9774cdd11f156027ad..df3fe1bdf89e44b7d5495d61e3fd06fd6e69dba1 100644 (file)
@@ -90,10 +90,9 @@ struct _GtkInspectorVisualPrivate
 G_DEFINE_TYPE_WITH_PRIVATE (GtkInspectorVisual, gtk_inspector_visual, GTK_TYPE_SCROLLED_WINDOW)
 
 static void
-fix_direction_recurse (GtkWidget *widget,
-                       gpointer   data)
+fix_direction_recurse (GtkWidget        *widget,
+                       GtkTextDirection  dir)
 {
-  GtkTextDirection dir = GPOINTER_TO_INT (data);
   GtkWidget *child;
 
   g_object_ref (widget);
@@ -103,7 +102,7 @@ fix_direction_recurse (GtkWidget *widget,
        child != NULL;
        child = gtk_widget_get_next_sibling (child))
      {
-        fix_direction_recurse (child, data);
+        fix_direction_recurse (child, dir);
      }
 
   g_object_unref (widget);
@@ -114,7 +113,7 @@ static GtkTextDirection initial_direction;
 static void
 fix_direction (GtkWidget *iw)
 {
-  fix_direction_recurse (iw, GINT_TO_POINTER (initial_direction));
+  fix_direction_recurse (iw, initial_direction);
 }
 
 static void
@@ -124,7 +123,8 @@ direction_changed (GtkComboBox *combo)
   const gchar *direction;
 
   iw = GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (combo)));
-  fix_direction (iw);
+  if (iw)
+    fix_direction (iw);
 
   direction = gtk_combo_box_get_active_id (combo);
   if (g_strcmp0 (direction, "ltr") == 0)